Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 9 Aug 2010 22:47:02 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 9 Aug 2010 22:47:02 +0000 (22:47 +0000)
commit285e4317e087d56c898a6a29b907573355496e93
tree43392ef0df915311a50d839280bfcb940ecffccb
parent9667564d7ac8b6206c36c221240489a59dba7047
parent521b3dfdfb7e674e0e25c9917d378a24fdcdf94f
Merge from mainline.